rust/pvimg/boot: Use 'PVIMG_PKGDATADIR'

mhartmay · hoeppnerj · commit f4fec5f1205c · 2025-07-29T18:23:49.000+02:00
Use 'PVIMG_PKGDATADIR' as it is used by the 'pvimg_pkg_data' macro rule. The problem only shows up if someone changes 'PVIMG_PKGDATADIR' to something different than the default. Fixes: f4cf4ae ("rust: Add a new tool called 'pvimg'") Reviewed-by: Jan Höppner <hoeppner@linux.ibm.com> Signed-off-by: Marc Hartmayer <mhartmay@linux.ibm.com> Signed-off-by: Jan Höppner <hoeppner@linux.ibm.com>
diff --git a/rust/pvimg/boot/Makefile b/rust/pvimg/boot/Makefile
@@ -7,7 +7,7 @@ DEBUG_FILES := $(addsuffix .debug,$(FILES))
 ifeq ($(HOST_ARCH),s390x)
 ZIPL_DIR := $(rootdir)/zipl
 ZIPL_BOOT_DIR := $(ZIPL_DIR)/boot
-PKGDATADIR := $(TOOLS_DATADIR)/pvimg
+PVIMG_PKGDATADIR ?= $(TOOLS_DATADIR)/pvimg
 
 INCLUDE_PATHS := $(ZIPL_BOOT_DIR) $(ZIPL_DIR)/include $(rootdir)/include
 INCLUDE_PARMS := $(addprefix -I,$(INCLUDE_PATHS))
@@ -86,9 +86,9 @@ stage3b.elf: head.o $(ZIPL_OBJS)
 	@chmod a-x $@
 
 install: stage3a.bin stage3b_reloc.bin
-	$(INSTALL) -d -m 755 $(DESTDIR)$(PKGDATADIR)
-	$(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 stage3a.bin $(DESTDIR)$(PKGDATADIR)
-	$(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 stage3b_reloc.bin $(DESTDIR)$(PKGDATADIR)
+	$(INSTALL) -d -m 755 $(DESTDIR)$(PVIMG_PKGDATADIR)
+	$(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 stage3a.bin $(DESTDIR)$(PVIMG_PKGDATADIR)
+	$(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 stage3b_reloc.bin $(DESTDIR)$(PVIMG_PKGDATADIR)
 
 else
 # Don't generate the dependency files (see `common.mak` for the
